Use upstream spf13 cobra #642
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use upstream isntead of fork for cobra. Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Signed-off-by: Daniel Nephin <dnephin@docker.com>
dnephin
requested review from
mdlinville,
thaJeztah and
vdemeester
as code owners
Codecov Report
@@ Coverage Diff @@
## master #642 +/- ##
=========================================
- Coverage 49.4% 49.4% -0.01%
=========================================
Files 208 208
Lines 17190 17194 +4
=========================================
+ Hits 8493 8494 +1
- Misses 8264 8267 +3
Partials 433 433 |
mdlinville
approved these changes
Oct 25, 2017
thaJeztah
reviewed
Oct 25, 2017
| @@ -8,6 +8,7 @@ Flags: | |||
| --cert-expiry duration Validity period for node certificates (ns|us|ms|s|m|h) (default 2160h0m0s) | |||
| --dispatcher-heartbeat duration Dispatcher heartbeat period (ns|us|ms|s|m|h) (default 5s) | |||
| --external-ca external-ca Specifications of one or more certificate signing endpoints | |||
| -h, --help help for update | |||
There was a problem hiding this comment.
ah, yes, think we previously special-cased -h / --help` and hid it, because using that flag will print the same information as is being printed here.
There was a problem hiding this comment.
Ya, I think we might have been relying on a side-effect of an issue that was fixed in cobra to hide this flag, after we migrated to cobra. I think we can restore the old behaviour by hiding this flag. I'll try it out.
thaJeztah
approved these changes
Oct 25, 2017
| @@ -97,9 +98,19 @@ func managementSubCommands(cmd *cobra.Command) []*cobra.Command { | |||
| return cmds | |||
| } | |||
|
|
|||
| // UseLine returns the usage line for a command. This implementation is different | |||
| // from the default Command.UseLine in that it does not add a `[flags]` to the | |||
| // of the line. | |||
There was a problem hiding this comment.
missed a word here "to the ..... of the line"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
spf13/cobrafinally merged all my PRs! So we can use upstream again.I think the man generation check might fail because the new
UseLineadds an unnecessary[flags]after the command. I was able to work around that for the yaml docs and help text, but I'll need to submit another patch to cobra to fix it for the man pages.